[XEN] Fix build. Mercurial ate my changeset fixups. :-(

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
index 552db91089e99553968a9ceb52a0e1d933da48a4..c499c8a447aa2841e3dffbc40c53aff9865fa62a 100644 (file)
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -994,7 +994,7 @@ do_grant_table_op(
         if ( unlikely(!guest_handle_okay(map, count)) )
             goto out;
         rc = -EPERM;
-        if ( unlikely(!grant_flip_permitted(d)) )
+        if ( unlikely(!grant_operation_permitted(d)) )
             goto out;
         rc = gnttab_map_grant_ref(map, count);
         break;
@@ -1006,7 +1006,7 @@ do_grant_table_op(
         if ( unlikely(!guest_handle_okay(unmap, count)) )
             goto out;
         rc = -EPERM;
-        if ( unlikely(!grant_flip_permitted(d)) )
+        if ( unlikely(!grant_operation_permitted(d)) )
             goto out;
         rc = gnttab_unmap_grant_ref(unmap, count);
         break;
@@ -1024,7 +1024,7 @@ do_grant_table_op(
         if ( unlikely(!guest_handle_okay(transfer, count)) )
             goto out;
         rc = -EPERM;
-        if ( unlikely(!grant_flip_permitted(d)) )
+        if ( unlikely(!grant_operation_permitted(d)) )
             goto out;
         rc = gnttab_transfer(transfer, count);
         break;

diff --git a/xen/include/xen/iocap.h b/xen/include/xen/iocap.h
index b3a5daec4541d4c721405960e5e37e26044c4dce..77c06f251780da0fef5463f9d907d73ba7f72127 100644 (file)
--- a/xen/include/xen/iocap.h
+++ b/xen/include/xen/iocap.h
@@ -36,7 +36,7 @@
  * domains with no hardware-access privileges to perform grant map/transfer
  * operations.
  */
-#define grant_operations_permitted(d)                   \
+#define grant_operation_permitted(d)                    \
     (!rangeset_is_empty((d)->iomem_caps))
 
 #endif /* __XEN_IOCAP_H__ */